WIP: Fixing some issues
Fixed multiple bugs