Fixes bugs some bugs