Fixed some issues, made some more