Code update

Fixed all my issues, sorry again for all of these commits.
Catching updates from master