Added features, refactored
Added features, refactored
Fixed bugs
Fixed lots o bugs and did more cross checking