fixing stuff
merged latest changes