General fixes and upadete