Fixed a lot of inconsistencies, started implementing encryption support and configuration file support