Fixed stuff and done some experiments...