made small cleanups... still no jquery.. need sleep