Minor fixes, jquery magic