Fixed the fully functional system, removed personal stuff