Work on several different issues. Started on bugs list