Repository moved. Some bugfix based on current codebase.