Revert "Added some small fixes"

This reverts commit 3168ebaf802a98a80d97e4510eb5d1c362538807.
Revert "Merge med Henrys ändringar"

This reverts commit 7c531839f51bc65909e40d1625fede473e1fa0d7.