cleanup
Added new schemes, fixed some bugs