Added some fixes, some functionality now