fixed stuff! basic stuff running ok