Cleaned up code, week diaply bug remains