some fixes and update to django 1.5