real date, ?fixed? bugs, refactoring