Added first time start functionality + bug fixes