nicole fixed bugs :-P

edit in place, add category, etc