TASK: fixing things
--the theme mostly