Fixing dependencise and stuff