reorganized the code a little bit. Cleaned up some unnecessary functionalities. Ready to release the next version.