Commented, cleaned and notable bug work