All fixes and stable/tested stuff