Cleaned up project + minor changes