code commnets, cleaning and few final bugs
final commit. final testing remaining