Updated, cleaned up setup, removed bugs regarding installation on different servers