Bugs fixed, add methods