Bugs update, cleanups