Working on bug fixes and working on some extra stuff