Fixes

Made some changes, it kind of works now