bugs fixed in various areas