Continued work on Bukget Api, stability improvements