Resolved bugs + cleaned