Bit more basic stuff + some changes