few more things working and bug fixes