fixed some fatal bugs. now 4/8