Pushing all changes that were left unpushed when my computer broke up

Changes were organized nicely in different commits