Fixed several things.. still working