better frame-buffering and refactor + cleanup :)