- Cleaned up, fixed some minor issues