fixed alotta bugs