Fixed spacing issues
Added timestamps
Minor refactoring
Added tag refining