more changes fixes, additions :)