Updated bugs and features