Fixed some more bugs. Getting close