Fixed and moved couple things