some positioning fixes, more additions