Quick bug fixes and moving stuff around.