Muchos bugfixes
changed file extension