Some updates in some classes. Still bugs in there