Fixed up bugs and added movement/switching