Major fixes

Pretty much bug free at the moment.
Fixed every little problem I had until now, moving on.