minor maintainence
bugfixes
bugfix + formatting
date
formatting