Fixed a few bugs and modified the structure just a bit.