Fixed some issues, extensive testing needed