Fixing some bugs and choosing my orientation strategy