A lot of changes

Long time without commits :D