First bunch of improvements and features added