1) Fixed a few more bugs