several bugs fixed + new funcionalities