- added more functionality; - fixed more bugs; - converted all tabs to spaces