working out the bugs
bug fixes