fixed bugs everywhere
should now work without a problem