little tweaks and testing method correcting