general cleanup and added functionality from issues tab