Fixed more bugs should be working now