Found new bugs and added suggestions