Many lil fixes jus 4 u <3
Merge branch 'refs/heads/Josh_0429'