Added bugs and features