Fixed some things after major problems