Few fixes and adding stuff