small changes and implementation of some classes
finished a task and added another one