fixing little TODOs
removing annoying regex test
adding comments
minor formatting
TODO moved to code
TODO moved to ticket