Few fixes, updates and otherwise stuff that looked out of place and/or lacking