Cleaned up, fixes and updates