polish: lots of updates from add modal, remove comments, do some cleanup etc