fixes #24; stub for #23 and #25; some styling updates