Bug fixing, cleaning up.