Fixed Yet...

…more bugs