Activated compiler swithces + fixed logical errors