fix bugs; expand fuctionality