Removed Parse, fixed some bugs