Fixed some initial issues