fixes to modifiers; decreased spacing on default theme, I think it looks better; minor bugfixes