Fixes everything

All issues resolved