* Fixed final bugs hopefully