Fixing, stuff refactoring.