bug fixes, small style change