fix some warnings and remove debug junk
commiting the latest changes