Taken feedback into account again

- All above problems
- Other quick miscellanous fixes