CODE: little help and fixed some bugs